modify jimmy's schema (fit to qidlove)