Added new code from everyone