Moved into original post (see update)