Removed the Duplicat Code