Changed to AUTO strategy + more work on view