Edited Button function calls