some changes
pimped a bit