fixed succesfull states
small customisation