deleted the commented parts if not needed