Dev: Changed some code