Removed function and moved to new variables