did some modifications following Craigs recommandations. ready to be merged