Much improved and nearly working!