Changed names and added logs