put christian's and riku's versions together