temporarily removed pw logic