Updated based on Jouni's comments