lastest changes to frontend
backend stuff