Better cell implementation