Cleaned up for sample purpose