enhancements from differents projects