updated methods, got rid of normal