Added stuff... I dont' even remember