Added a bit of cool stuff