big update for preparaation for launch