Better logic - stil Sorc oriented