working on gallery core