adding changes from crowdy