refactored
added the direct assignment