Got more features brought back in