added abbreviations and infrastructure