corrections after comparing deprecates with callie