Improved code massivly