Will do after @Phaeodaria has integrated his work.