That bath scene at the start was definitely a choice since Naoto ended up getting sick and then he just wanted more anyway