Made things more automatic