Inspired by Thomas better version