Version 2.5 that actually works :)