updated functionality and bootstrap