little bit of planning, added stop check, some properties