working
fix latest things