changed and added alot...