Added some frame management