updated to add resolve and best practices