merged changes from pro version