Merge with Fabio's file