Didn't need that method, also fixed #19 #23 #24 #27 #28