Removed extra code @ expense of design time speed