re-fixed beam and stuff