EDIT: what you've done looks good, Kabling.