elyse first commit

noted & fixed