Some safeguards added; some decor :)