removed magic numbesr