Final update for now

Final update for now