removed func shortcuts & added new version func