adding  some of marcels stuff