Modifications per Gabebw- mostly spacing