Rename and Some changes for starting :)