Readded stuff I accidentaly removed. :)