Made two previous commits work