update on 5 apr

update on 5 apr issue fixes