Melanie|Fixing few things