Bootstrap added, trading changes