made function names more sensible