Changed some parts so it would better fit my needs