Cleaning up. Added #4