updated to active record proxy