work on resolve