Few less important changes
Method signature corrected