First condition - post

Initial work
Actually, maybe it's OK. I just realized that we will use the manager, and not access this method directly, so it's probably OK as is, now that I see how you implement it in the manager.