Removed @ fram variables