Simple logic added, more needed