file 08

Some feature that needs to be merged to main project.