modified 3-5, added 3-6