merging Charly and Godwinh's version
initial merge