Added XAlemi's stuff