syncing changes. added in some basic functions