Added additional logic

Accidentally lisped