#200: rollback some changes
#200: updated specs