developed stuff in master again