Was not perfect but it it now