Refactored without Object!