Change to the previous version with some tweaks