Bit more responsive now