can now close with echap button