Made all this stuff working