bring inline with simey.me changes