A lot more working now