fixing code now