Peformance improvements + others
Transfer