updated still working on it