Updated copy & merged changes