Fixing ryan feature

merge conflic fixing session on this feature
Ryan & Seb pairing on it