first hack

new branch with a few modification