More tweaking to make sure it works