Merged Online and Offline updated for version 0.9