Implemented stare; tidying