Removing performance bottle neck. Close #5