Kates Changes from adding buttons