Re-implemented bootstrap