updated to online version and updated mixins