Finally, major integration bugs are fixed!!!