slight modifications to awesome functionality