Major sub update + Fix