Tried to do that now. Not sure if it is better this way.