Replaced inline version with new.