re-arranged a little