I really don't think this should be any different than the current version