gallery model changed, NOT TESTED