Updated Base Code