more code organization (not working)