Futher logic revision.