WIP5

Small changes