some cool changes ;)