making it work a bit more