huge update with oliveer