further changes to make 2 compatible