removed bootstrap and simplified