Began adding custom logic