Moved Logic Up One Level