some updates to base structure