Adding old logic