Final update, added space replace