Improve a little bit, very hacky... bad dev, bad!