Updated for use with touch devices