Achievement 1 Logic made more intelligent