removed aaron's warnings