adding common files for integration and fixing drawing issue