Implemented new (hopefully better) logics