Removed wait for transition stuff, since overall it was not looking quite as nice, now it seems to be behaving ...