merged everything just need suk's new developement