add first enter logic