* Fixed some code