Removed JB and changed design