Merged with Andrea #1-5