Changed module workings