slightly working now