I finally made some modifications, we still have some space left