fixed

This works ! But still ugly code.