updated with preview