more changes to fuction names etc