Added missign method call and more improvments