More proper :)