Moved calls around