Updated mockup PSD and testing confilct stuff