Changed a method to public, will be changed and optimized next week