minor changes add shorts added