Coomented out queue part for now