Add complexity for q3
Fix q4 stuffs