Fixing logic problems; Commenting both approaches: Fixing some stupidness