Updated source and fixed priority bug