some changes..

hope this does not break anything..