working ok now