First start of rewrite based on DAs suggestions