Some better work on it