Added logic into Enter state methods