some beauty added :)